switch: Don't check whether revision matches
authorColin Walters <walters@verbum.org>
Wed, 26 Feb 2014 20:12:08 +0000 (15:12 -0500)
committerColin Walters <walters@verbum.org>
Wed, 26 Feb 2014 20:12:08 +0000 (15:12 -0500)
It's quite possible that say "buildmaster" and "smoketested" are the
same revision - but we should allow switching between them.

src/ostree/ot-admin-builtin-switch.c

index d74461846096aaac06649d6eea181526d4f96227..d1306cf47046ecf587497cd53033fe16f533eb0d 100644 (file)
@@ -46,7 +46,6 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
   GOptionContext *context;
   const char *new_ref = NULL;
   gs_unref_object OstreeRepo *repo = NULL;
-  gs_free char *origin_refspec = NULL;
   gs_free char *origin_remote = NULL;
   gs_free char *origin_ref = NULL;
   gs_free char *new_revision = NULL;
@@ -124,11 +123,7 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
                                 error))
     goto out;
 
-  if (strcmp (ostree_deployment_get_csum (merge_deployment), new_revision) == 0)
-    {
-      g_print ("Refspec %s is unchanged\n", origin_refspec);
-    }
-  else
+  if (TRUE)
     {
       gs_unref_object GFile *real_sysroot = g_file_new_for_path ("/");